x86: Clean up c/s 20844:ca0759a08057

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 93e64e8c38c878db2a41a8b463f88943db174a0b..1881f39c8f77ba3c4d7a917cf18ccec3dd9c0842 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -1229,16 +1229,16 @@ static irq_guest_action_t *__pirq_guest_unbind(
 
     BUG_ON(!(desc->status & IRQ_GUEST));
 
-    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
+    action = (irq_guest_action_t *)desc->action;
+    irq = desc - irq_desc;
+
+    if ( unlikely(action == NULL) )
     {
         dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
-            d->domain_id, pirq);
+                d->domain_id, pirq);
         return NULL;
     }
 
-    action = (irq_guest_action_t *)desc->action;
-    irq = desc - irq_desc;
-
     for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ )
         continue;
     BUG_ON(i == action->nr_guests);
@@ -1360,7 +1360,7 @@ static int pirq_guest_force_unbind(struct domain *d, int irq)
         goto out;
 
     action = (irq_guest_action_t *)desc->action;
-    if ( unlikely((desc->status | IRQ_DISABLED) && (desc->action == NULL)) )
+    if ( unlikely(action == NULL) )
     {
         dprintk(XENLOG_G_WARNING, "dom%d: pirq %d: desc->action is NULL!\n",
             d->domain_id, irq);